dash: hide tooltips when overview begins hiding

Otherwise the tooltip remains visible until the overview animation is
completed, which is odd.

https://bugzilla.gnome.org/show_bug.cgi?id=674241

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 69caf5b02d3035da318f31e992d077da3e0a5d5f..320defb90599ce3a63be969192b1bc2fc1fdef17 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -133,7 +133,6 @@ const DashItemContainer = new Lang.Class({
     },
 
     hideLabel: function () {
-        this.label.opacity = 255;
         Tweener.addTween(this.label,
                          { opacity: 0,
                            time: DASH_ITEM_LABEL_HIDE_TIME,
@@ -459,6 +458,13 @@ const Dash = new Lang.Class({
                                Lang.bind(this, function() {
                                    this._onHover(item, display)
                                }));
+
+        Main.overview.connect('hiding',
+                              Lang.bind(this, function() {
+                                  this._labelShowing = false;
+                                  item.hideLabel();
+                              }));
+
         return item;
     },
 
@@ -474,7 +480,7 @@ const Dash = new Lang.Class({
                     }));
                 if (this._resetHoverTimeoutId > 0) {
                     Mainloop.source_remove(this._resetHoverTimeoutId);
-                this._resetHoverTimeoutId = 0;
+                    this._resetHoverTimeoutId = 0;
                 }
             }
         } else {